Enterprise Version
was carefully merged